Merge from trunk
authorJason Rumney <jasonr@gnu.org>
Thu, 14 Jan 2010 14:19:01 +0000 (22:19 +0800)
committerJason Rumney <jasonr@gnu.org>
Thu, 14 Jan 2010 14:19:01 +0000 (22:19 +0800)

Trivial merge